Use '' for non-translated strings

Pay attention to the style guidelines.

https://bugzilla.gnome.org/show_bug.cgi?id=660600

diff --git a/js/misc/gnomeSession.js b/js/misc/gnomeSession.js
index c661d4140c99e3b300e674c8917206edcaab785c..b3dc0689188f0c67e45c46790824d3efea621eae 100644 (file)
--- a/js/misc/gnomeSession.js
+++ b/js/misc/gnomeSession.js
@@ -78,7 +78,7 @@ function Inhibitor(objectPath) {
 Inhibitor.prototype = {
     _init: function(objectPath) {
         DBus.session.proxifyObject(this,
-                                   "org.gnome.SessionManager",
+                                   'org.gnome.SessionManager',
                                    objectPath);
         this.isLoaded = false;
         this._loadingPropertiesCount = InhibitorIface.properties.length;
@@ -94,7 +94,7 @@ Inhibitor.prototype = {
 
                     if (this._loadingPropertiesCount == 0) {
                         this.isLoaded = true;
-                        this.emit("is-loaded");
+                        this.emit('is-loaded');
                     }
                 }));
         }

diff --git a/js/ui/boxpointer.js b/js/ui/boxpointer.js
index 979e2d147f567287f5cda5c97ed3ee62d3884cfb..989a08954fdc7d3e5a0a7b6d124722e534dc3bde 100644 (file)
--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@@ -75,7 +75,7 @@ BoxPointer.prototype = {
         Tweener.addTween(this, { opacity: 255,
                                  xOffset: 0,
                                  yOffset: 0,
-                                 transition: "linear",
+                                 transition: 'linear',
                                  onComplete: onComplete,
                                  time: POPUP_ANIMATION_TIME });
     },
@@ -106,7 +106,7 @@ BoxPointer.prototype = {
         Tweener.addTween(this, { opacity: 0,
                                  xOffset: xOffset,
                                  yOffset: yOffset,
-                                 transition: "linear",
+                                 transition: 'linear',
                                  time: POPUP_ANIMATION_TIME,
                                  onComplete: Lang.bind(this, function () {
                                      this.actor.hide();

diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
index 52ab2ab7d5ce2da04af938a71025aab0c5758d0c..446fe722705ea5be33115e644375e5a48d7dc757 100644 (file)
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -289,7 +289,7 @@ function loadExtension(dir, enabled, type) {
     }
 
     if (extensions[uuid] != undefined) {
-        logExtensionError(uuid, "extension already loaded");
+        logExtensionError(uuid, 'extension already loaded');
         return;
     }
 

diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index 13677671b3b173e2fdb21f4a4fd2d2eb27ffb416..b5e14f071c63847e39171134429d7835472f71a1 100644 (file)
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -75,7 +75,7 @@ Key.prototype = {
         this._extended_keys = this._key.get_extended_keys();
         this._extended_keyboard = null;
 
-        if (this._key.name == "Control_L" || this._key.name == "Alt_L")
+        if (this._key.name == 'Control_L' || this._key.name == 'Alt_L')
             this._key.latch = true;
 
         this._key.connect('key-pressed', Lang.bind(this, function ()
@@ -340,7 +340,7 @@ Keyboard.prototype = {
                     right_box.add(button.actor);
                 else
                     left_box.add(button.actor);
-                if (key.name == "Caribou_Prefs") {
+                if (key.name == 'Caribou_Prefs') {
                     key.connect('key-released', Lang.bind(this, this.hide));
 
                     // Add new key for hiding message tray

diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js
index c371895577e37b9cfec65dfe343b7e1a0ed9ed77..4db755b95f0fb645f2d9fd171002a2cbaff2376c 100644 (file)
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -157,9 +157,9 @@ Signals.addSignalMethods(Notebook.prototype);
 function objectToString(o) {
     if (typeof(o) == typeof(objectToString)) {
         // special case this since the default is way, way too verbose
-        return "<js function>";
+        return '<js function>';
     } else {
-        return "" + o;
+        return o.toString();
     }
 }
 
@@ -322,7 +322,7 @@ ObjInspector.prototype = {
                     link = new St.Label({ text: '<error>' });
                 }
                 let hbox = new St.BoxLayout();
-                let propText = propName + ": " + valueStr;
+                let propText = propName + ': ' + valueStr;
                 hbox.add(new St.Label({ text: propName + ': ' }));
                 hbox.add(link);
                 this._container.add_actor(hbox);
@@ -343,7 +343,7 @@ ObjInspector.prototype = {
             this.actor.move_anchor_point(Math.floor(sourceX + sourceWidth / 2),
                                          Math.floor(sourceY + sourceHeight / 2));
             Tweener.addTween(this.actor, { scale_x: 1, scale_y: 1,
-                                           transition: "easeOutQuad",
+                                           transition: 'easeOutQuad',
                                            time: 0.2 });
         } else {
             this.actor.set_scale(1, 1);

diff --git a/js/ui/main.js b/js/ui/main.js
index 4e67ecab0edc2d404e114673c011e3da428490d5..7e2588ffa71a4ffb4c07dab2156e4352a2ee4e01 100644 (file)
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -494,9 +494,9 @@ function notify(msg, details) {
 function notifyError(msg, details) {
     // Also print to stderr so it's logged somewhere
     if (details)
-        log("error: " + msg + ": " + details);
+        log('error: ' + msg + ': ' + details);
     else
-        log("error: " + msg)
+        log('error: ' + msg);
 
     notify(msg, details);
 }

diff --git a/js/ui/telepathyClient.js b/js/ui/telepathyClient.js
index 43e1423174496d136d499301edfae8a965f50f38..0ea3a7e9eb19329770656682fb60c8ca6ce416ac 100644 (file)
--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@@ -570,7 +570,7 @@ ChatSource.prototype = {
     open: function(notification) {
           if (this._client.is_handling_channel(this._channel)) {
               // We are handling the channel, try to pass it to Empathy
-              this._client.delegate_channels_async([this._channel], global.get_current_time(), "", null);
+              this._client.delegate_channels_async([this._channel], global.get_current_time(), '', null);
           }
           else {
               // We are not the handler, just ask to present the channel

diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
index 607d66c7045e02a9932ee2345ceff99d8508cda1..22988fababb372eee75218c71b6fad9115dcc35e 100644 (file)
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -310,7 +310,7 @@ IMStatusChooserItem.prototype = {
             return;
 
         status = this._statusForPresence(newPresence);
-        msg = msg ? msg : "";
+        msg = msg ? msg : '';
         this._accountMgr.set_all_requested_presences(newPresence, status, msg);
     },
 
@@ -346,7 +346,7 @@ IMStatusChooserItem.prototype = {
             return;
 
         status = this._statusForPresence(newPresence);
-        msg = msg ? msg : "";
+        msg = msg ? msg : '';
 
         this._expectedPresence = newPresence;
         this._accountMgr.set_all_requested_presences(newPresence, status, msg);